fix tidy modernize-use-override (#1380)

diff --git a/gui/filterdata.h b/gui/filterdata.h
index d61201d2352c51024533ef247d252d2b6891c2f3..9bde74b8a66d7c4fa49b735d35fd4d2e38cab80a 100644 (file)
--- a/gui/filterdata.h
+++ b/gui/filterdata.h
@@ -79,7 +79,7 @@ public:
     startTime = stopTime.addMonths(-6);
     startTime.setTime(QTime(0, 0, 1));
   }
-  virtual void makeSettingGroup(SettingGroup& sg)
+  void makeSettingGroup(SettingGroup& sg) override
   {
     sg.addVarSetting(new BoolSetting("trks.inUse", inUse_));
     sg.addVarSetting(new BoolSetting("trks.GPSFixes", GPSFixes));
@@ -111,7 +111,7 @@ public:
     sg.addVarSetting(new IntSetting("trks.splitDist", splitDist));
     sg.addVarSetting(new IntSetting("trks.splitDistUnit", splitDistUnit));
   }
-  virtual QStringList makeOptionString();
+  QStringList makeOptionString() override;
 
 public:
   bool title;
@@ -146,8 +146,8 @@ public:
   {
   }
 
-  virtual QStringList makeOptionString();
-  virtual void makeSettingGroup(SettingGroup& sg)
+  QStringList makeOptionString() override;
+  void makeSettingGroup(SettingGroup& sg) override
   {
     sg.addVarSetting(new BoolSetting("wpts.inUse", inUse_));
     sg.addVarSetting(new BoolSetting("wpts.radius", radius));
@@ -183,8 +183,8 @@ public:
   {
   }
 
-  virtual QStringList makeOptionString();
-  virtual void makeSettingGroup(SettingGroup& sg)
+  QStringList makeOptionString() override;
+  void makeSettingGroup(SettingGroup& sg) override
   {
     sg.addVarSetting(new BoolSetting("rttrk.inUse", inUse_));
     sg.addVarSetting(new BoolSetting("rttrk.reverse", reverse_));
@@ -218,8 +218,8 @@ public:
   {
   }
 
-  virtual QStringList makeOptionString();
-  virtual void makeSettingGroup(SettingGroup& sg)
+  QStringList makeOptionString() override;
+  void makeSettingGroup(SettingGroup& sg) override
   {
     sg.addVarSetting(new BoolSetting("mscflt.nukeRoutes", nukeRoutes_));
     sg.addVarSetting(new BoolSetting("mscflt.nukeTracks", nukeTracks_));

diff --git a/gui/filterwidgets.h b/gui/filterwidgets.h
index 7de8ea1ecf57615195da0da0c9ca9db5a0d4d84c..571c914c1a5dfa5ebc86c8c9b8cb98c4447f2e49 100644 (file)
--- a/gui/filterwidgets.h
+++ b/gui/filterwidgets.h
@@ -117,11 +117,11 @@ public:
   BoolFilterOption(bool& b, QAbstractButton* ck):  b(b), checkBox(ck)
   {
   }
-  void setWidgetValue()
+  void setWidgetValue() override
   {
     checkBox->setChecked(b);
   }
-  void getWidgetValue()
+  void getWidgetValue() override
   {
     b = checkBox->isChecked();
   }
@@ -139,11 +139,11 @@ public:
   {
     sb->setRange(bottom, top);
   }
-  void setWidgetValue()
+  void setWidgetValue() override
   {
     spinBox->setValue(val);
   }
-  void getWidgetValue()
+  void getWidgetValue() override
   {
     val = spinBox->value();
   }
@@ -160,11 +160,11 @@ public:
   StringFilterOption(QString& val, QLineEdit* le):  val(val), lineEdit(le)
   {
   }
-  void setWidgetValue()
+  void setWidgetValue() override
   {
     lineEdit->setText(val);
   }
-  void getWidgetValue()
+  void getWidgetValue() override
   {
     val = lineEdit->text();
   }
@@ -188,11 +188,11 @@ public:
   {
     le->setValidator(new QDoubleValidator(minVal, maxVal, decimals, le));
   }
-  void setWidgetValue()
+  void setWidgetValue() override
   {
     lineEdit->setText(QString("%1").arg(val, 0, format, decimals));
   }
-  void getWidgetValue()
+  void getWidgetValue() override
   {
     val = lineEdit->text().toDouble();
     val = qMin(val, maxVal);
@@ -214,11 +214,11 @@ public:
   DateTimeFilterOption(QDateTime& val, QDateTimeEdit* w):  val(val), w(w)
   {
   }
-  void setWidgetValue()
+  void setWidgetValue() override
   {
     w->setDateTime(val);
   }
-  void getWidgetValue()
+  void getWidgetValue() override
   {
     val = w->dateTime();
   }
@@ -235,11 +235,11 @@ public:
   ComboFilterOption(int& val, QComboBox* w):  val(val), w(w)
   {
   }
-  void setWidgetValue()
+  void setWidgetValue() override
   {
     w->setCurrentIndex(val);
   }
-  void getWidgetValue()
+  void getWidgetValue() override
   {
     val = w->currentIndex();
   }
@@ -302,7 +302,7 @@ class TrackWidget: public FilterWidget
 public:
   TrackWidget(QWidget* parent, TrackFilterData& tf);
 
-  virtual void checkChecks()
+  void checkChecks() override
   {
     otherCheckX();
     FilterWidget::checkChecks();

diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 78ba6ee32bdf9bbd8b6b0125991c087eeb175ee8..641955577043ab17b9b37a85866821bb019408e9 100644 (file)
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -108,8 +108,8 @@ private:
   QString getFormatNameForExtension(const QString& ext);
 
 protected:
-  void closeEvent(QCloseEvent*);
-  void changeEvent(QEvent*);
+  void closeEvent(QCloseEvent*) override;
+  void changeEvent(QEvent*) override;
 
 private slots:
   void aboutActionX();
@@ -118,8 +118,8 @@ private slots:
   void browseOutputFile();
   void closeActionX();
   void donateActionX();
-  void dragEnterEvent(QDragEnterEvent*);
-  void dropEvent(QDropEvent* event);
+  void dragEnterEvent(QDragEnterEvent*) override;
+  void dropEvent(QDropEvent* event) override;
   void filtersClicked();
   void helpActionX();
   void inputDeviceOptBtnClicked();

diff --git a/gui/map.h b/gui/map.h
index 6c2e69b7ab1fbfc89acdbeef335501cfc1684211..892a3e8402e572e9ab67ba0a4d65e996ca9df1b5 100644 (file)
--- a/gui/map.h
+++ b/gui/map.h
@@ -132,7 +132,7 @@ private:
 
 
 protected:
-  virtual void resizeEvent(QResizeEvent* event);
+  void resizeEvent(QResizeEvent* event) override;
 
 };
 

diff --git a/gui/setting.h b/gui/setting.h
index 9a770450ec366f0cb6162358f1e0a2c22d4601c5..28bb13b5bf578daa26fc701f4ac7d0bc13a23a43 100644 (file)
--- a/gui/setting.h
+++ b/gui/setting.h
@@ -44,11 +44,11 @@ class IntSetting: public VarSetting
 {
 public:
   IntSetting(const QString& name, int& var):  name_(name), var_(var) { }
-  void saveSetting(QSettings& st)
+  void saveSetting(QSettings& st) override
   {
     st.setValue(name_, var_);
   }
-  void restoreSetting(QSettings& st)
+  void restoreSetting(QSettings& st) override
   {
     if (st.contains(name_)) {
       var_ = st.value(name_).toInt();
@@ -65,11 +65,11 @@ class DoubleSetting: public VarSetting
 {
 public:
   DoubleSetting(const QString& name, double& var):  name_(name), var_(var) { }
-  void saveSetting(QSettings& st)
+  void saveSetting(QSettings& st) override
   {
     st.setValue(name_, var_);
   }
-  void restoreSetting(QSettings& st)
+  void restoreSetting(QSettings& st) override
   {
     if (st.contains(name_)) {
       var_ = st.value(name_).toDouble();
@@ -86,11 +86,11 @@ class StringSetting: public VarSetting
 {
 public:
   StringSetting(const QString& name, QString& var):  name_(name), var_(var) { }
-  void saveSetting(QSettings& st)
+  void saveSetting(QSettings& st) override
   {
     st.setValue(name_, var_);
   }
-  void restoreSetting(QSettings& st)
+  void restoreSetting(QSettings& st) override
   {
     if (st.contains(name_)) {
       var_ = st.value(name_).toString();
@@ -107,11 +107,11 @@ class BoolSetting: public VarSetting
 {
 public:
   BoolSetting(const QString& name, bool& var):  name_(name), var_(var) { }
-  void saveSetting(QSettings& st)
+  void saveSetting(QSettings& st) override
   {
     st.setValue(name_, var_);
   }
-  void restoreSetting(QSettings& st)
+  void restoreSetting(QSettings& st) override
   {
     if (st.contains(name_)) {
       var_ = st.value(name_).toBool();
@@ -128,11 +128,11 @@ class DateTimeSetting: public VarSetting
 {
 public:
   DateTimeSetting(const QString& name, QDateTime& var): name_(name), var_(var) { }
-  void saveSetting(QSettings& st)
+  void saveSetting(QSettings& st) override
   {
     st.setValue(name_, var_);
   }
-  void restoreSetting(QSettings& st)
+  void restoreSetting(QSettings& st) override
   {
     if (st.contains(name_)) {
       var_ = st.value(name_).toDateTime();